Skip to content

Conversation

@miccheng
Copy link
Contributor

@miccheng miccheng commented May 1, 2016

No description provided.

@miccheng miccheng force-pushed the phpconfasia2016 branch from 5faf0b7 to 5afd272 Compare May 1, 2016 16:33
@miccheng
Copy link
Contributor Author

miccheng commented May 9, 2016

Hello?

@bjori
Copy link
Member

bjori commented May 18, 2016

@derickr could you look at this one too? It was submitted before the confoo one, so I'm curious why this wasn't reviewed and merged first

@bjori
Copy link
Member

bjori commented May 18, 2016

//cc @Stelian @EliW

@EliW
Copy link
Contributor

EliW commented May 18, 2016

I don't have merge access here, nor know how things are setup here with the sync'ing between the two repos. I only know how to commit conferences myself directly into the main repo. So can't help with a merge request on GitHub.

@salathe
Copy link
Contributor

salathe commented May 18, 2016

@bjori
Copy link
Member

bjori commented May 18, 2016

click the "or view command line instructions".
It'll show you have to merge this locally if that is more comfortable.

Another alternative is, if you feel most comfortable creating the entry yourself, is to click "files changed" and copy&paste the values of the xml when you run ./createNewsEntry manually.

I think it is very sad situation we are in now. People that volunteered to help maintaining this section only merge conferences from a very selective group of organizers. Not the smaller conferences that are not directly related to the high profile conferences organized by the same tea party.

@miccheng
Copy link
Contributor Author

@EliW @bjori I have rebased and fixed the merge conflict. Its kinda funny how slow this thing works.

@php-pulls php-pulls merged commit 9200d77 into php:master May 20, 2016
@EliW
Copy link
Contributor

EliW commented May 20, 2016

I've followed Peter @salathe 's instructions and have merged this. Thank you Peter for showing me how. I didn't even know about the qa.php.net website nor it's handy feature of showing you the github pulls and how to merge them.

To Hannes @bjori … Please stop attempting to find conspiracy where there is none. You constantly assume the worst of us conference organizers. Versus the reality of us all being overworked, highly-under-paid, and just trying to help everyone out where we can, while being highly fallible humans. I've always published every conference I can.

In this case, as I stated above, I'd never been shown how to do a github->php.net merge before, and assumed that I didn't have access to do so. So once requests came in this way, I hadn't paid attention to them waiting for someone else with merge-access to do so. Now that I know how, I can. I'd brought this up on the list before, but the fact that the mailing list still 50% of the time decides that anyone on comcast is a spammer and blocks our emails, makes it hard for me to community there.

The really unfortunate part is that the code exists to fully automate this process (via the joind.in integration). But it keeps not being finalized and pushed up. Which would 100% clear this whole thing up anyway. :-/

@bjori
Copy link
Member

bjori commented May 20, 2016

Thanks @EliW !

Looking forward to seeing more from you

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants